Remove deprecations slated for 24.3 #5203
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
conda-bot
added
the
cla-signed
kenodegard
force-pushed
the
deprecations
branch
from
6c590be
to
1b8aec6
Compare
kenodegard
force-pushed
the
deprecations
branch
from
1b8aec6
to
c1a2bc3
Compare
kenodegard
commented
Mar 8, 2024
Comment on lines
+877
to
+880
| # NOTE: The function has to retain the "get_install_actions" name for now since | ||
| # conda_libmamba_solver.solver.LibMambaSolver._called_from_conda_build | ||
| # checks for this name in the call stack explicitly. | ||
| def get_install_actions( |
jezdez
approved these changes
Mar 8, 2024
| @@ -30,7 +30,7 @@ requirements: | |||
| run: | |||
| - beautifulsoup4 | |||
| - chardet | |||
| - conda >=22.11.0 | |||
| - conda >=23.5.0 | |||
3 tasks
beeankha
approved these changes
Mar 8, 2024
mbargull
reviewed
Mar 11, 2024
Comment on lines
-427
to
-475
| @deprecated( | ||
| "24.1.0", "24.5.0", addendum="Use `conda_index._apply_instructions` instead." | ||
| ) | ||
| def _apply_instructions(subdir, repodata, instructions): | ||
| repodata.setdefault("removed", []) | ||
| utils.merge_or_update_dict( | ||
| repodata.get("packages", {}), | ||
| instructions.get("packages", {}), | ||
| merge=False, | ||
| add_missing_keys=False, | ||
| ) | ||
| # we could have totally separate instructions for .conda than .tar.bz2, but it's easier if we assume | ||
| # that a similarly-named .tar.bz2 file is the same content as .conda, and shares fixes | ||
| new_pkg_fixes = { | ||
| k.replace(CONDA_PACKAGE_EXTENSION_V1, CONDA_PACKAGE_EXTENSION_V2): v | ||
| for k, v in instructions.get("packages", {}).items() | ||
| } | ||
|
|
||
| utils.merge_or_update_dict( | ||
| repodata.get("packages.conda", {}), | ||
| new_pkg_fixes, | ||
| merge=False, | ||
| add_missing_keys=False, | ||
| ) | ||
| utils.merge_or_update_dict( | ||
| repodata.get("packages.conda", {}), | ||
| instructions.get("packages.conda", {}), | ||
| merge=False, | ||
| add_missing_keys=False, | ||
| ) | ||
|
|
||
| for fn in instructions.get("revoke", ()): | ||
| for key in ("packages", "packages.conda"): | ||
| if fn.endswith(CONDA_PACKAGE_EXTENSION_V1) and key == "packages.conda": | ||
| fn = fn.replace(CONDA_PACKAGE_EXTENSION_V1, CONDA_PACKAGE_EXTENSION_V2) | ||
| if fn in repodata[key]: | ||
| repodata[key][fn]["revoked"] = True | ||
| repodata[key][fn]["depends"].append("package_has_been_revoked") | ||
|
|
||
| for fn in instructions.get("remove", ()): | ||
| for key in ("packages", "packages.conda"): | ||
| if fn.endswith(CONDA_PACKAGE_EXTENSION_V1) and key == "packages.conda": | ||
| fn = fn.replace(CONDA_PACKAGE_EXTENSION_V1, CONDA_PACKAGE_EXTENSION_V2) | ||
| popped = repodata[key].pop(fn, None) | ||
| if popped: | ||
| repodata["removed"].append(fn) | ||
| repodata["removed"].sort() | ||
|
|
||
| return repodata |
There was a problem hiding this comment.
This is slated for removal in 24.5 at the earliest.
We have downstream code to adjust beforehand.
See #5152 (comment) .
3 tasks
This was referenced Mar 12, 2024
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Changes:
conda.core.subdir_data.SubdirData._process_raw_repodata)conda_build.index(part of switch to conda-index)conda_build.environ.get_install_actionsin favor ofconda_build.environ.get_package_records(part of deprecatingconda.models.dist.Dist)conda.exportsandconda_build.conda_interfaceChecklist - did you ...
newsdirectory (using the template) for the next release's release notes?Add / update outdated documentation?